From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 9 Feb 2011 01:22:42 +0000 (+0100)
Subject: kbd-status: Remove support for disabling the indicator
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~9083
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=11064c0e35e1dd614166f2e4df51e13ac81f5e2b;p=gnome-shell.git

kbd-status: Remove support for disabling the indicator

The status icon should always be visible if more than two layouts
are configured. The settings key which was used to enforce hiding
the icon in this case as well has already been removed from the
g-s-d schema, causing an error on startup.
---

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 6e6ccee54..111c3c015 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -15,8 +15,6 @@ const PanelMenu = imports.ui.panelMenu;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
-const INDICATOR_SCHEMA = 'org.gnome.settings-daemon.plugins.keyboard';
-
 function LayoutMenuItem() {
     this._init.apply(this, arguments);
 }
@@ -62,10 +60,6 @@ XKBIndicator.prototype = {
         this._labelActors = [ ];
         this._layoutItems = [ ];
 
-        this._indicatorSettings = new Gio.Settings({ schema: INDICATOR_SCHEMA });
-        this._indicatorSettings.connect('changed::disable-indicator', Lang.bind(this, this._sync_config));
-
-        this._disableIndicator = false;
         this._showFlags = false;
         this._config = Gkbd.Configuration.get();
         this._config.connect('changed', Lang.bind(this, this._sync_config));
@@ -81,8 +75,6 @@ XKBIndicator.prototype = {
     },
 
     _sync_config: function() {
-        this._disableIndicator = this._indicatorSettings.get_boolean('disable-indicator');
-
         this._showFlags = this._config.if_flags_shown();
         if (this._showFlags) {
             this._container.set_skip_paint(this._iconActor, false);
@@ -91,7 +83,7 @@ XKBIndicator.prototype = {
         }
 
         let groups = this._config.get_group_names();
-        if (groups.length > 1 && !this._disableIndicator) {
+        if (groups.length > 1) {
             this.actor.show();
         } else {
             this.menu.close();